Merge from emacs-23 branch
authorChong Yidong <cyd@gnu.org>
Wed, 25 Jan 2012 05:55:01 +0000 (13:55 +0800)
committerChong Yidong <cyd@gnu.org>
Wed, 25 Jan 2012 05:55:01 +0000 (13:55 +0800)
commitbd01e8b1021d9aa03d0da41cdb63099e703d7c5f
tree2001980daf56bd8b763dcf2a52ae645fb5e87069
parent9e741b2273979be7676343eb95418bd23e5b4e55
Merge from emacs-23 branch
src/ChangeLog
src/coding.c